Enterprise Version
merging together